+ Changes due to situation acquisition refactoring