Added hibernate flags for Device, progress on #664