Initial commit of entityFactory