Working on protecting the API