WIP: support IV and EFLC too