Rerformed the json deserialization and the builder return