Missing imports & Update query corrections