Added entityID stuff