KAZOO-2406: Keep list of arguments