Updated gesture mapper