Add logger & remove facade class.