Seperate the API macros