Added classes and methods