Added resources for listings, updated metrics saving