Add a few APIs for the server
resolve merge conflict with pods