Weaver Library

    Improve listing