refactoring / constructors in immutable-builders: always use not-null-fields from corresponding entities as constructor-arguments, set default values where possible, implement builder-methods for all other fields.