Improved modular build
Updated libs