Make Output-engine compatible with Chitah