Simplfy the admin system