Cleaned up DataModel