1) Changes the annotations on model classes to be on fields instead of methods
2) Corrected annotations
3) Fixed classes
4) Added Jackson support