Extra annotations

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