Feature and Updatesite changes