Core classes added