Use cases execution improvements