Server. Opaque upgrade refactored