Move config out from util