Handle value types better