UPDATE: add more packages