improved rest mapping output and admin output