Refactored to remove the miniBagService