Remove call to Namespace
Implement Composition pattern
Use Annotations instead of Field Name for 'kind' and 'name'