Add more to sign generation