Support for multiple libraries

Early 2021 clean-up: duplicate