Add Message size handling.