Changes made for api namespace