Changed the assign signatures to first the key, then the value