Add support for libraries