Updated new constants and class name