Added support libs
Manually Fixed broken code