Refactored service structure - now using transaction scripts