Removed JWK/E/S stuff since that is handled by another module.
Updated parameter names
Updated parameter names