DNN-6234 - removed internal set to allow unit testing