Now pks/lookup handles 'op' parameter + code refactoring