more entities added rudimentary Annotations, Importer added