Use new signatures format; adapt code to suit it