Added details, removed GPE device