More CS on administrator modules