Add remaining packages suggested by magnars