Removed defaults from data model (will be readded later as a transformation step)