Calculation parameters update
Two template classes added