update server to use kwargs