* Made refresh and calls from cli more predictable