REFACTOR: Boost version