fixup! Controller annotations consistency