Upgrade to partial classes