fs2 monitoring refactoring