Modified structure to accomodate other libraries