Modified classes to allow initial conditions to be modified