Moved calculated fields to model