Add annotation support into the parser