Add back packages and close #381