namespace and label mapping added