Upgrade basic cells