Add logs and comments