some refactoring
Merge branch 'NBT-181_basicDAO' into NBT-189_enum_objects