1. Added better mapping code.