Updated signatures with new encoding