Moved methods into Utilities & created Factories