added group and some calculation attributes