Updated to always return a logger