Improve output after create/update