Made additional changes to reflect changes to the library.