Fixed Serialization Issue with Contracts