Removing dependency to boost options