Stable PRE-Release

Some work still need to be done like adding more and more tags
for now it only contain support for economyAPI
any help would gladly be appreciated