DDF-657 added setters for all fields