+ Forgot several imports
+ add TupleConstructor, Cannonical, and AnnotationCollection