Added basic entity models