Refactor Situation model