Added constants and a struct.