This should use watched entity too