Improve Gambio detection