CFY-1761 fix operation mapping to use schema