Added uid-safe dep