Revert "removing this"

This reverts commit c8917ae572f0b9dffe3d14ae7804bd580d18d5d1.
Revert "Removed if/elseif block and replaced with a static HashMap containing Operator ID's"

This reverts commit 8801fc5163e36a5e79146b11ed1dc06e0961ace9.