Renamed library elements, implement xml reader