Changing internal apis a bit.