Add ESF Core classes