Add Operation types to support emulation, clean up parsing