[#84] Reorganized implementation of entity methods.