Re-structure Model to use simpler attributes