Change calculate method signature as a workaround for ISIS-629 and add some validation too