Moving to a common package for constatns