Cleaning up
Adding admin_api