Continued admin namespace work