Switch to sync implementation
0.0.5