Added logger and exceptions