Updated group export