Handle more use cases.