Added constants mapping