Updated to work with latest GEF4 Zest