More admin/cms generator work