Upgrade: Functional completion