Slight changes to config setup