Added shindig-extras