Adding group and type fields