Modifying some classes to better do json desterialzation
Updating the jackson annotations