Move annotations to the mixin