Removed depricated char * conversion, added const keywords