Added missing fields in get_hosts_stats and get_available_resource and cleaned-up