Finishes #59 support in the native client