Added missed genlib_map modifications