use new constants signature