Add support for SEF and SEF Advanced in particular