Added replacements for uid functions