Enhanced the admin config form