Improved GA support in the Api Libs

Same as comment on line 40.