refactoring beans that they are 1:1 with db schema