improved library handling