Added some general settings