Added multi library support