Updated data parsing