Separated configuration protection from configuration; added more comments