Revisited the way definition and calculation parameters are handled -
REPORT-461