Updated Activity lifecycle