Added constants where applicable.