Added logger and FIXME