Refactored suspended and closed methods on session