Added inheritance mapping support in uploadable entities for the YAML driver
Add generic, non-annotation traits

Traits without annotations for easy integration purposes.