Finally got Siphy to work with the new annotations