A second rework of the native client