Upgrade to Hiberate 4