Add some annotation and CR-LF