Refactoring: add usecases class