need to modify the way that object are saved into the database everywhere!