Extra annotations

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

Noted, Jean-Marie has explained the different between `find` and `findByQuery`. I will leave this alone as this approach does work ok.