Splitting setSystemState in two services