I've tried to remove whole AnnotationContext file and this method then would end up in AnnotationFile class. Is it ok, @mindplay-dk ? I thought that AnnotationFile is data structure only and shouldn't contain any logic to work on that data.