Started to refactor for custom settings