fs2 monitor refactoring