Fix for bug as there is admin data for instances as well