Add support for String Enumeration type
Add BMM icons
Slightly improve primitive type serialiser routine.