Improve contract efficiency