Moved data parsing into processing