Add support for custom format blocks