Added required mapping modules and libraries