Added feature name tracking and entropy limit for features