Refactor data contract.