This reverts commit 1300d9128d064d95295e41ee546e49f9878ecee8.
And add notification function to update class.