Updated library based on modifications made on CoopTD