Added basic row parsing