Initial Commit
Updated factory class

Updated factory class