Main library files and dependency version fix