Added more support for enumurated types.