Added basic CLI support