Made some changes for row factory.