Added some constness to methods