Better conditional handling