Add standard method to swap functions in GP
Complete xml output