Library changes included