Add missing signature params?