Modified setting to be more generic