Updated apt handling