Made it xml independent