Parser changes and XML validation