Signatures and Map added