Lib name can be configured; Mapper regex corrected