Added guard to avoid redefinition of constants