Updated many references