Add packages and some comments