Add support for the custom service