Improved GA support in the Api Libs