More values in the masterfile and derivatives