Refactoring annotation hash table