Expanded class hierarchy of EntityDB