Updated components added in the EntityFactory
Reverted some commenting changes