Added some extra settings