Add stuff for hibernation support