Added density independent model derivatives and solution