Add more info to comments