Refactored engine interface