Added missing packages and fixed rest