Updates on Calendar and User Fields