Adding infrastructure for internal match/actions