Add engine infrastructure