Update docs, config sample and utils