ENYO-3082: replaced calls to registry with direct calls