Added exports to annotated as well