1. Changes according to new library architecture.