Add new variables in order to support ALL cases. api-url is now
hardcoded