Use correct structures