Update for new API
Set as NOT rt-safe; Update submodule