Add safety features