Allow explicitly stating callback uri in case of rewriting
Formatting
Add CLI-commands