Adding refactored engine