Settings better configurable