More usecase changes