Update data implementation and bug fixing