Move values to Constants