Updated library stuff