Add dbdemo and watched classes