Fixed array import issues