Changed blocks to enum.