Update for NON BOOST libraries