Change cli to allow user to pre-configure