modified solution import, closer to xsd added some exception handling