native connector changes: no more non-standard code