Add andMode support