Added parts of library task