Updated to use pacman 4.1 features