Added classes and imports