Improves commad-line management