Updating to use std instead of boost wherever possible just for ease