Updated the annotation engine to use configuration