Added system-admin section support