Adds some additional mappings and re-enable python3