[Update] Adding fallback function for default values