Added classes and expanded a few