Add custom operator part
cleanup