BRID-160 Refactor of int to string and addition of group