Updated library functions