Adding ifs support