add factories and run annotate