Refactoring the gef plugin to be more expressive