Fixed implementation of annotations