Now accounts for logger being passed in