The Astromaterials Data System (AstroMat) is a NASA-funded project, working in close collaboration with the Johnson Space Center (JSC) to provide access to and preserve analytical data from JSC’s astromaterials collections. Meteorite data from close to 1000 peer-reviewed publications, primarily from the JSC Antarctic collections, and data from over 800 lunar publications have been ingested into AstroMat. Data can be explored at the level of reference and sample, or queried interactively through the AstroDB Search (AstroSearch). AstroSearch v 1.0 incorporated lunar and meteorite JSC collections, lunar missions, geofeatures, taxons, analyzed materials, and analysis methods searches. Working closely with domain scientists we have developed AstroSearch v 2.0. This version of the interface enhances the functionality of the original by adding search by chemistry (with comprehensive variable and unit selection), more granular analysis type refinement, and a streamlined customizable data output. The AstroDB Search is paired with the AstroDesk application, where users can login via their ORCiD and save an unlimited number of customized search queries. For researchers who need to submit, archive, and share their data with citable unique identifiers (DOIs) to comply with publisher and funding agency requirements, AstroMat offers a companion service to the AstroDB - the Astromaterials Data Repository (AstroRepo). Through its commitment to long-term data access and preservation, the Astromaterials Data Systems aims to help align cosmochemistry data with the Big-Data Era and reduce time to science for Planetary Sciences researchers by providing FAIR data for next generation scientific applications.