DDF-517: Lowering restrictions to allow for extending