Readded secret_token for now, need to remove in future