Simplify the way we handle conditions options for associations