Added optional blocks for some of the elements.