* Add signature checks
