Added new library with improved repositories mapping