Integrate signature into new implementation