Updated library class