Updated for latest annotation component