Added classes and comments