Added type tracking for features