Removed boost compatibility until all samples for boost are written