Modify Data Class