Modified the admin files to make use of the new system.