Refactor to expose logger with stats - Pivotal 37680929