Added synchronous option