Add Library support