Const correctness added