Add more service support