Remove Range and use std::list