Some small changes for simplified data contracts