added more structures