Improved model picking metadata