Moved additional actions to post-update (+ small refactoring)