Updated key constants and error messages