DEVIDM-94: Moved annotations to make sure the aspect can find them.