Changed key from Value to interface{}