Break out mapping methods to separate partial classes