improved unleash-server api