Supports more block types