added basic entity support