Add docs and dirty state fields