gani parsing functionality and other improvements