Adjusted dependencies and engine interface.