Parsing row is now handle with a function