redesigned config stucture