Added custom service support