gapi moved stuff to main interface