GAPI Updates