Reworked the structure of a block to be more universal