Make all examples work with CLI