Fixed rest json serialization