Revert "Removed if/elseif block and replaced with a static HashMap containing Operator ID's"

This reverts commit 231cf58fe2ce40055813df5c257e6ad5e863d28a.