Sync with libnpengine