Support new style signature.
But, not supported parts is still there.