Added type and blocksize support