Updated for const correctness