Added Library Support