Add logger and streamline functionality, responsibility