More soft protection settings and some refactoring