Split XML service + update code