Updated import structure