An improved unified constitutive model for rock material and guidelines for its application in numerical modelling