Indeed. So unifying it to your proposed signature sounds reasonable.