Upgrade custom type and dataset behaviors