Remove direct access to vector
const correctness