XisAction refactor