Add more sane structure