Updated files to use Constants.h