Oops, add missing file from imports change and update Makefile.am.
Implement annotations.