Core classes development