Added non-enumerated types in preperation for arbitary typing.