Uuid refactoring (uuid needed now for auth)