BATCH-1797 - updated the method signatures from 'get' to 'find'