updated mapping tables