Add some package & fix