Clean and added more use cases