Additional use case changes