Added OnResume and OnSuspend