Added a command line behaviour