Core classes commit