Add additional parameter and token security