Further refactor for simplified config