Change things around to match leto api changes