Move jackson annotations to the fields. 

Fixes a problem with new jackson 2.3