Fixed A1 imports