Slight refactor and add default config constructors