added structures & blocks