Updates to the insertion annotation builder.
Fixing annotation builders.