Engine: namespace-users: updated for feedback