Use non-deprecated finders
Consistency with the previous spec