More command line friendly