added annotations support for the client side