Annotations ReaderInterface restructure