More tool library work