Any reason for not adding the uuid filter here? The two ```onDiscover``` functions look the same.