Added some constness