Refactored state make methods to use case class's copy.