Added some more settings and packages