Switched to dict for features.