Mapping added, update fixed, annotations added