Core: Moved session restore to Handler