Updated for Tribe 0.3