refactoring around DataEntity fields