adapt usecases to the new structure