Add main classes and fields