Adding group id support. Group id needs corrections.