added basic data parsing