Added classes and method