Rework directives and implement object update.