Add initial structure (take 2)