Refactoring. Added BeanModelGenerator