Fixed compilation and added an enumeratio