Moved state saving to activity