[UPDATE] Add engine and resolverFactory skeleton