Upgrade frame decorator handling