Updated library includes