Add remaining config options