Added in more structures