Make Import and Simulation independent