Added initial multi ligand support