Update structure and few other updates