Added classes and scenarios