Updating handling of data watching
Updating handling of data watching
Improving loading