Some work to reenable shadow with base instance