Moving annotation parsing away from annotation reader. Currently unstable