Performance and stability improvement of SDK