Added conditional magic support