add defaulting to Settings and Property services