Reworked updateData methods to be more flexible.