Added labels to enums and type ref to enum validator

Signed-off-by: Tom Wright <tom@inflatablecookie.com>