Improved contract handling, additional methods