Bunch of detector changes