Add client side only annotations where they are necessary.