Added contract resolvers and attributes to manage serialization