Add support for update, fix urls