Add comments and annotations