added custom operator handling and test