Added task scope to some keys in order to provide further flexibility