Updated situation type to more descriptive types