Added Spec and Class enums. Refactored Domain a little.
Added additional domain classes.