Added basic entity factory