Changes based on new library architecture