Updated import paths