Added cross-file imports to fill dependancies