Changed how libraries are stored/referenced