Add more logging for testing purposes