Refined the Case Lifecycle