Added and updated structure blocks