Started improved structure initialization