added switch + database settings storage