ENYO-2528: better use of new methods