Updated to include more annotations