Add default_token support, etc.