Many updates in definitions of constants and some 'deprecated' annotations