Modifications so a custom Record Reader shouldn't be needed