Add 32/512 block support