Enhanced the way to extract data