Removed dependency on boost