conform to schema's fn macro
fixed import
added annotation data handling, currently non-optional
new version