Added basic entity model