Added Lib Independent functionality