Update with the new way of doc/demo generation