Added more imports to be less dependent on composer autoloader