Adding support for ems