Added freezing support