Add type and value to hash tokens