Add separate support for gpe