Added Values by Type

Added a handler to get the appropriate value based on type.