Fixed setup for import