Added math overrides on the records