Add lib for command line support