Enrich Ameli analysis and refactor Gasoline