Added discovery functionality per-system