Add freeze and some other stuff