Row extractor POC added