Modified files to recognize new libraries