Removed Boost dependency (for now)