Constants definition updated