Small refactoring to go through an use case object
Fixes