Add Boost components back in