Reconfiguring the values to make it easier to expand