Add engine and factory