Additional config rrefactor