* Add Core classes