Added in remaining config args