Fixed complicated usecase code