Added in Weiss data structures