Made more generic by removing specific version references