Add support for native service