new service system + fixed warnings