Added more structures