Updated library to include all files