Better handling of value