Easier annotation adding

... custom annotations