Updated code for 1.7 and updated mapping

(ASM does not work yet)