Detection combo refactor