Refactoring of the FEIG API calls