Added support for the synchronous engine