Not sure about moving shifting constant values as it can be a BCB for extension not using constant name