DDF-561: Updated version