Started working on separating factories from the core