Make apt-sm more comprehensive