yes, it seems better to make this change in api.