Make the use of e.gd optional. Refactoring/renaming