Lib import improvement