Add --unified option