Upgrade Courtyard classes