Adjustment to application_x unification