Add some logging and allow token response types