Small molecule ligands exhibit a diverse range of conformations in solution. Upon binding to a target protein, this conformational diversity is generally reduced. However, ligands can retain some degree of conformational flexibility even when bound to a receptor. In the Protein Data Bank (PDB), a small number of ligands have been modeled with distinct alternative conformations that are supported by X-ray crystallography density maps. However, the vast majority of structural models are fit to a single ligand conformation, potentially ignoring the underlying conformational heterogeneity present in the sample. We previously developed qFit-ligand to sample diverse ligand conformations and to select a parsimonious ensemble consistent with the density. While this approach indicated that many ligands populate alternative conformations, limitations in our sampling procedures often resulted in non-physical conformations and could not model complex ligands like macrocycles. Here, we introduce several improvements to qFit-ligand, including the use of routines within RDKit for stochastic conformational sampling. This new sampling method greatly enriches low energy conformations of small molecules and macrocycles. We further extended qFit-ligand to identify alternative conformations in PanDDA-modified density maps from high throughput X-ray fragment screening experiments. The new version of qFit-ligand improves fit to electron density and reduces torsional strain relative to deposited single conformer models and our previous version of qFit-ligand. These advances enhance the analysis of residual conformational heterogeneity present in ligand-bound structures, which can provide important insights for the rational design of therapeutic agents.