Proper handling of defaults