Fixed unique name constraint
Rendering annotations per type