Add GPE support