Fixed the extension to be in sync with GD SDK