added haibu support and improved service system