Simplify scenario state element classes