Cleaned up data contracts