BIG config refactor