Changes according to new library architecture