Added intermediate class actor and update xml structure