Done with custom inheritance
Rename annotations