Abstracted a few calls to AnnotationManger and may have fixed issues with empty byte errors