Made some refactoring, adding new method to FSStatesList