Moved default imports to after declared imports, added check to prevent repeated import