Fixed XML reading classes