Added Back Logic for Factory Class