Simplify modern targets and generalize