Added classes and headers.