Removed large reliance on tag switch statement