More command line launching support done