renamed Entity to EntityObject class