add block-style XML building
remove deprecated bit! method
pass Avatar updater to the new XML builder