Add combined option and long option API