Added classes and some methods