Make more CLI friendly
Add reference links