Committing more use cases from the main