Removed boost dependency