Improved EconomyAPI