added admin and registry stuff