Support for gapi