Situation Tags and Missing Dependency Added