Updated to use new boost libs