Updating config options and removing workaround