Better handling of defaults