Adds synchronous flag to facilitate testing