adapted to new toribio/lumen module structure