Need to add seperate support for boost - removed samples