Update configuration and add a bit of documentation