Added support for verbatim blocks, refactored blocks