Added gapi loading