Updated for accounting entity and service package moves