First pass at cleaning up admin response API