Added more const to function arguments