Updated for Gittern changes