Minor rewrite of config and instances