Added basic entity structure