added ability to override columns and fields