Add review changes: logger and exceptions