Removed boost dependence for the moment