More work on MWT internal apis