Computed fields moved to models