Add support for extern equ and set