Moved auto-loading out of the Library class