Added <if> support 

Extended support of <if> condition