Added more use case scenarios