Removing dependency to boost