Core classes are now included in the main class