Added classes and minor adjustments