Make detector interface simpler