Boost related changes