Updates to improve matching with real System.Data types