Update all references, add import to the refactored class and corrected the format of the factory