Adapt A1 controller to latest A1 spec