*8381* Update dashboard wrapper