Added some const qualifiers