[TASK] Make uid argument optional