Changed Package Import to handle variations in header column prop names