OP-1554 Added functionality to add fields with enum type and have markers added to scopes.

Still a few smallish things to fix.