Fixing updating issue by using subclass.