Changed type of commons Entity.type from long to ObjectType