Update to support user-specified signatures