Extra annotations

Adding extra annotation points to the model


----
--breaking

FYI this is probably simply `return "from Instrument where id = :id"` but yours might be clearer