SW-16 New feature for AnnotationDrivenMapper

See issue page #24 for more details.