Further enhancements

* collect arguments rather than prompt the user
* only distribute in enterprise