Added type enum for values