Got rid of s:SignatureMap dictionary