Made edits to make the configuration more reload-friendly