Added GroupAndStack import