Add more safe variables