Add desired structure, needs fine tuning