Better handling of console commands