Added systemSettings mechanism